Weekly Log PRE2019 3 Group15: Difference between revisions

From Control Systems Technology Group
Jump to navigation Jump to search
 
(37 intermediate revisions by 5 users not shown)
Line 3: Line 3:
=Weekly Log=
=Weekly Log=
==Week 2==
==Week 2==
Goal: Do literature research, define problem, make a plan, define users, start research into design and prototype
<b>Goal</b>: Do literature research, define problem, make a plan, define users, start research into design and prototype
{| class="wikitable", border="1" style="border-collapse:collapse"
{| class="wikitable", border="1" style="border-collapse:collapse"
|-
|-
Line 82: Line 82:


==Week 3==
==Week 3==
Goal: Continue research, start on design
<b>Goal</b>: Continue research, start on design
{| class="wikitable", border="1" style="border-collapse:collapse"
{| class="wikitable", border="1" style="border-collapse:collapse"
|-
|-
Line 133: Line 133:
|
|
|
|
|  
| Added to the SotA by implenting parts of the research <i> 30 minutes</i>
|-
|-
! scope="row"| Saturday 22-02
! scope="row"| Saturday 22-02
Line 224: Line 224:


==Week 4==
==Week 4==
Goal: Finish first design, start working on software.
<b>Goal</b>: Finish first design, start working on software.
{| class="wikitable", border="1" style="border-collapse:collapse"
{| class="wikitable", border="1" style="border-collapse:collapse"
|-
|-
Line 247: Line 247:
|  
|  
|
|
| Worked on explaining the feedforward and feedback parameters more clearly in [[#A first model|the concept model]]: <i>2 hours</i>
| Worked on explaining the feedforward and feedback parameters more clearly in [[PRE2019_3_Group15#A first model|the concept model]]: <i>2 hours</i>
|
|
|
|
Line 289: Line 289:
|  
|  
| Finalized pre-filtering backend + made API calls more reliable <i> 4 hours</i>
| Finalized pre-filtering backend + made API calls more reliable <i> 4 hours</i>
| Processed the results of the multiple regression analysis and added them to the [[#Excitement prediction with multiple regression|wiki]]: <i>3 hours</i>
| Processed the results of the multiple regression analysis and added them to the [[PRE2019_3_Group15#Excitement prediction with multiple regression|wiki]]: <i>3 hours</i>
|
|
| Worked more on node.js, expressJS and the UI: <i>6 hours</i>
| Worked more on node.js, expressJS and the UI: <i>6 hours</i>
Line 297: Line 297:


==Week 5==
==Week 5==
Goal: Work on software
<b>Goal</b>: Work on software
{| class="wikitable", border="1" style="border-collapse:collapse"
{| class="wikitable", border="1" style="border-collapse:collapse"
|-
|-
Line 344: Line 344:
|  
|  
| Ideated extra backend implementations: <i>1 hour</i>  
| Ideated extra backend implementations: <i>1 hour</i>  
| Creating a graphical [[#System overview|system overview]]: <i>2 hours</i>
| Creating a graphical [[PRE2019_3_Group15#System overview|system overview]]: <i>2 hours</i>
|
|
|
|
| Worked on a more general grouping of the different genres and worked on the visualization of a part of the back end <i>45 minutes</i>
| Worked on a more general grouping of the different genres and worked on the visualization of a part of the back end <i>1 hour</i>
|-
|-
! scope="row"| Saturday 14-03
! scope="row"| Saturday 14-03
|  
|  
|  
|  
| Describing the [[#System overview|system overview]] on the Wiki: <i>2 hours</i>
| Describing the [[PRE2019_3_Group15#System overview|system overview]] on the Wiki: <i>2 hours</i>
| Started working on interview with [[#The Effenaar|the Effenaar]]: <i>1 hour</i>
| Started working on interview with [[PRE2019_3_Group15#The Effenaar|the Effenaar]]: <i>1 hour</i>
| Worked on getting to know Bootstrap JS for creating the UI: <i>2 hours</i>
| Worked on getting to know Bootstrap JS for creating the UI: <i>2 hours</i>
|
|
Line 360: Line 360:
|  
|  
|  
|  
| Worked on a [[#Excitement matching with QET|QET matching algorithm]]: <i>2.5 hours</i>
| Worked on a [[PRE2019_3_Group15#Excitement matching with QET|QET matching algorithm]]: <i>2.5 hours</i>
|  
|  
| Worked on learning parts that are useful for creating the UI & a little bit on the UI itself: <i>5 hours</i>
| Worked on learning parts that are useful for creating the UI & a little bit on the UI itself: <i>5 hours</i>
Line 368: Line 368:


==Week 6==
==Week 6==
Goal: Finish software , do testing
<b>Goal</b>: Finish software , do testing
{| class="wikitable", border="1" style="border-collapse:collapse"
{| class="wikitable", border="1" style="border-collapse:collapse"
|-
|-
Line 390: Line 390:
|
|
|  
|  
| Worked further on [[#A script for QET matching algorithm|QET]] track ordering: <i>2 hours</i><br/>Looked into Java MATLAB connection: <i>1 hour</i>
| Worked further on [[PRE2019_3_Group15#A script for QET matching algorithm|QET]] track ordering: <i>2 hours</i><br/>Looked into Java MATLAB connection: <i>1 hour</i>
|  
|  
| Worked on UI <i>2 hours</i>
| Worked on UI <i>2 hours</i>
Line 399: Line 399:
| Looked into Webflow. <i>2 hours</i>
| Looked into Webflow. <i>2 hours</i>
|  
|  
| Worked out interview with [[#The Effenaar|the Effenaar]]: <i>2 hours</i>
| Worked out interview with [[PRE2019_3_Group15#The Effenaar|the Effenaar]]: <i>2 hours</i>
|  
|  
|
|
Line 406: Line 406:
|  
|  
|  
|  
| Worked on an interface for the [[#A script for QET matching algorithm|QET]], now works with .txt files: <i>2 hours</i><br/>Learned gitHub: <i>1 hour</i>
| Worked on an interface for the [[PRE2019_3_Group15#A script for QET matching algorithm|QET]], now works with .txt files: <i>2 hours</i><br/>Learned gitHub: <i>1 hour</i>
|  
|  
| Worked on UI <i>5 hours</i>
| Worked on UI <i>5 hours</i>
Line 433: Line 433:
|  
|  
|
|
| Added new inputs and a value display to the [[#User interface | UI]] <i>2 hours</i>
| Added new inputs and a value display to the [[PRE2019_3_Group15#User interface | UI]] <i>2 hours</i>
| Worked on the user interface using the code Yvonne made. I changed the HTML slightly and added CSS in Adobe Dreamweaver. <i> 2 hours </i>
| Worked on the user interface using the code Yvonne made. I changed the HTML slightly and added CSS in Adobe Dreamweaver. <i> 3 hours </i>
|-
|-
|}
|}


==Week 7==
==Week 7==
Goal: Finish up the last bits of the software
<b>Goal</b>: Finish up the last bits of the software
{| class="wikitable", border="1" style="border-collapse:collapse"
{| class="wikitable", border="1" style="border-collapse:collapse"
|-
|-
Line 486: Line 486:
|  
|  
|  
|  
| Worked on a [[#A GUI for QET matching|GUI]] for QET matching: <i>2 hours</i>
| Worked on a [[PRE2019_3_Group15#A GUI for QET matching|GUI]] for QET matching: <i>2 hours</i>
| Scanning through the wiki on unsubstantiated choices and other nitpicking: <i>2 hours</i>
| Scanning through the wiki on unsubstantiated choices and other nitpicking: <i>2 hours</i>
| Worked on the UI <i>6 hours</i>
| Worked on the UI <i>6 hours</i>
Line 494: Line 494:
|  
|  
|  
|  
| Worked on [[#A GUI for QET matching|GUI]] for QET matching: <i>3 hours</i>
| Worked on [[PRE2019_3_Group15#A GUI for QET matching|GUI]] for QET matching: <i>3 hours</i>
|
|
|
|
|
| Made mockups of the lay-out of the final site and got feedback from users <i> 2.5 hours </i>
|-
|-
! scope="row"| Sunday 29-03
! scope="row"| Sunday 29-03
Line 510: Line 510:


==Week 8==
==Week 8==
Goal: Finish wiki, presentation
<b>Goal</b>: Finish wiki, presentation
{| class="wikitable", border="1" style="border-collapse:collapse"
|-
|
! scope="col"| Group
! scope="col"| Mats Erdkamp
! scope="col"| Sjoerd Leemrijse
! scope="col"| Daan Versteeg
! scope="col"| Yvonne Vullers
! scope="col"| Teun Wittenbols
|-
! scope="row"| Monday 30-03
| We attended the tutor session and had a skype meeting after that ourselves <br/><i>30 minutes + 1 hour</i>
| Attended the tutor meeting: <i>1.5 hours</i>
| Attended the tutor meeting: <i>1.5 hours</i>
| Attended the tutor meeting: <i>1.5 hours</i>
| Attended the tutor meeting: <i>1.5 hours</i>
| Attended the tutor meeting, slightly adjusted mockups and analyzed my own results from the user test. <i>2.5 hours</i>
|-
! scope="row"| Tuesday 31-03
|
|
| Worked on the Wiki page: <i>1.5 hours</i>
|
| Worked on restructuring the wiki <i> 2 hours </i>
| Updated the [[PRE2019_3_Group15##State of the Art | SotA]] and [[PRE2019_3_Group15##User interface | user interface]] reorganized the structure of the wiki <i> 3 hours </i> Worked on the new user interface of the website using CSS <i> 3 hours</i>
|-
! scope="row"| Wednesday 01-04
|
| Spent time on CSS <i>2 hours</i>
| Working on the presentation and wiki: <i>2 hours</i>
|
| Read other wikis to find out what could still be added to our wiki. Executed user-tests <i> 1 hour </i>
| Worked on the user interface of the website using CSS <i> 1.5 hours </i>
|-
! scope="row"| Thursday 02-04
| Had an online group meeting: <i>1.5 hours</i>
|
| Attended meeting: <i>1.5 hours</i>, worked on presentation: <i>2 hours</i>
| Attended the tutor meeting: <i>1.5 hours</i>
|Attended the group meeting: <i>1.5 hours</i>
|
|-
! scope="row"| Friday 03-04
|
|
| Worked on the presentation: <i>1 hour</i>, had a meeting: <i>1 hour</i>
|
| Worked on the [[PRE2019_3_Group15#Introduction | Introduction ]] and more on the structure of the page <i>1 hour</i>
|
|-
! scope="row"| Saturday 04-04
|
| Spent time on code optimization: <i>8 hours</i>
| Worked on the presentation: <i>30 minutes</i>
|
| Worked on the [[PRE2019_3_Group15#Validation of the user needs | Validation of the user needs ]] <i>2 hours</i>
|
|-
! scope="row"| Sunday 05-04
|
| Kept working on the code: <i>6 hours</i>
|
| Worked on the [[PRE2019_3_Group15#Validation of the user needs | Validation of the user needs ]] <i>4 hours</i>
|
| Worked on the User Interface of the website. <i> 4 hours </i>
|-
|}
 
==Week 9==
<b>Goal</b>: Finish wiki, site and  last things
{| class="wikitable", border="1" style="border-collapse:collapse"
|-
|
! scope="col"| Group
! scope="col"| Mats Erdkamp
! scope="col"| Sjoerd Leemrijse
! scope="col"| Daan Versteeg
! scope="col"| Yvonne Vullers
! scope="col"| Teun Wittenbols
|-
! scope="row"| Monday 06-04
|
| Finished the code and the CSS-layout <i>8 hours</i>
| Worked on the presentation: <i>2 hours</i>
| Worked on the [[PRE2019_3_Group15#Validation of the user needs | Validation of the user needs]]: <i>2 hours</i>
Worked on the [[PRE2019_3_Group15#Future Works | Future Works]]: <i>30 minutes</i>
| Finished [[PRE2019_3_Group15#Introduction| Introduction]] and [[PRE2019_3_Group15#Validation of the user needs | user test 1]] <i>2 hours</i>
|Finished the UI of the website. Added a part on the [[PRE2019_3_Group15#User interface|user interface]] in the wiki and did a spell check of the whole wiki. Wrote part of the [[PRE2019_3_Group15#Conclusion | conclusion]] and [[PRE2019_3_Group15#Discussion| discussion]]<i> 7 hours + 1 hour + 1</i>
|-

Latest revision as of 23:07, 6 April 2020

Go back to PRE2019 3 Group15

Weekly Log

Week 2

Goal: Do literature research, define problem, make a plan, define users, start research into design and prototype

Group Mats Erdkamp Sjoerd Leemrijse Daan Versteeg Yvonne Vullers Teun Wittenbols
Monday 10-02 We formed a group and discussed the first possibilities within the project, chose a general theme and started doing research. We attended the tutor session.


30 minutes + 30 minutes

Work on SotA and evaluate design options Attended meeting with tutors: 30 minutes
Elaborated the notes of the meeting: 30 minutes
Reading and summarizing scientific literature on the interaction between DJ and crowd: 3 hours
Attended meeting with tutors: 30 minutes Attended tutor meeting


0.5 hours

Started doing literature research and summarized Pasick (2015) & Johnson. Formed a group and attended meeting.


2 hours + 30 minutes + 30 minutes

Tuesday 11-02 Searching scientific literature on user requirements of the public and the DJ at a party (Gates, Subramanian & Gutwin, 2006), (Gates & Subramanian, 2006): 1 hour
Wednesday 12-02 Summarizing scientific literature on user requirements: 3 hours Started looking for papers about user interaction and user feedback


2 hours

Thursday 13-02 We had a meeting in which we discussed the feedback from the tutor session, discussed the research and formed a more detailed and specific plan for the project.


1.5 hours

Meeting with group members, discussing who will be doing what the coming week: 1.5 hours Meeting with group members, discussing who will be doing what the coming week. Emailed Effenaar.


1.5 hours

Did some more research on audience interaction and summarized it. (Hödl, Fitzpatrick, Kayali & Holland, 2017)(Zhang, Wu, & Barthet, ter perse) I, also updated the wiki, made the planning more clear and divided the references of the SotA. Attended the meeting.


1.5 hours + 45 minutes + 1.5 hours

Friday 14-02 Developed access to spotify API 4 hours. Researched different forms of audience interaction and added it to the SotA. PRE2019_3_Group15#Receiving feedback from the audience via technology


1.5 hours

Saturday 15-02 Created data set from spotify API: 8 hours Writing the "Users" section based on my prior literature research: 2 hours
Updating the section on state of the art based on my prior literature research: 2 hours
Sunday 16-02 Updating the lay-out of the wiki: 1 hour Updating the milestones and deliverables. Continued looking for papers on incorporating user feedback and user feedback for music events. Summarized papers (Barkhuus & Jorgensen, 2008) & (Atherton, Becker, McLean, Merkin & Rhoades, 2008)


2.5 hours

Week 3

Goal: Continue research, start on design

Group Mats Erdkamp Sjoerd Leemrijse Daan Versteeg Yvonne Vullers Teun Wittenbols
Monday 17-02 Group meeting and general discussion: 45 minutes Attended tutor meeting: 30 minutes. Discussion with group members: 15 minutes. Attended tutor meeting: 30 minutes. Discussion with group members: 15 minutes. Attended tutor meeting: 30 minutes. Discussion with group members: 15 minutes. Attended tutor meeting:


45 min

Tuesday 18-02
Wednesday 19-02 Worked on a first concept model of our designed system, A first model. 4 hours Elaborated the notes of the meeting: 30 minutes
Thursday 20-02 Group meeting, discussing plans and everyone's contributions: 1 hour Group meeting, discussed plans 1 hour Attended group meeting: 1 hour. Worked on how the user needs lead to a first model: 2 hours Attended group meeting: 1 hour Attended group meeting: 1 hour Attended group meeting:


1 hour

Friday 21-02 Added to the SotA by implenting parts of the research 30 minutes
Saturday 22-02
Sunday 23-02

Carnaval Break

Group Mats Erdkamp Sjoerd Leemrijse Daan Versteeg Yvonne Vullers Teun Wittenbols
Monday 24-02 Worked on a schematic to show how the user needs relate to our design: 1.5 hours
Tuesday 25-02
Wednesday 26-02
Thursday 27-02 Worked on a model to predict music parameters using the Spotify dataset in a multiple regression model: 2 hours Get to know the basics of node.js


1.5 hours

Friday 28-02 Worked on getting to know javascript, node.js, and visual studio: 6 hours.
Saturday 28-02
Sunday 1-03 Started integration of data set in Tempo curve algorhithm 4 hours. Did research on the Effenaar: 30 minute
Elaborating on the algorithm in the first model: 2 hours
Continued on getting to know javascript and node.js. Also started on getting to know express JS: 4 hours.

Week 4

Goal: Finish first design, start working on software.

Group Mats Erdkamp Sjoerd Leemrijse Daan Versteeg Yvonne Vullers Teun Wittenbols
Monday 02-03 We attended the tutor session and went to the Effenaar in order to get some general information about the possibilities, and or user needs.


30 minutes + 1 hour

Attended the tutor meeting: 30 minutes
Had a conversation with the Effenaar: 1 hour
Attended the tutor meeting: 30 minutes
Had a conversation with the Effenaar: 1 hour
Worked out the notes on the conversation with Effenaar: 30 minutes
Attended the tutor meeting: 30 minutes
Had a conversation with the Effenaar: 1 hour
Attended the tutor meeting: 30 minutes
Tuesday 03-03 Worked on explaining the feedforward and feedback parameters more clearly in the concept model: 2 hours
Wednesday 04-03 Did research on the Spotify audio features, tried to come up with exact definitions: 2 hours
Thursday 05-03 We had a meeting in which we discussed the feedback from the tutor session, discussed the research and formed a more detailed and specific plan for the project.


1.5 hours

Attended the group meeting: 1.5 hours Attended the group meeting: 1.5 hours Attended the group meeting: 1.5 hours Attended the group meeting: 1.5 hours Attended the meeting


1.5 hours

Friday 06-03 Cleaned up data set generation code 2 hours
Saturday 07-03 Added new tags to data set & included pre-filtering backend. 7 hours Worked on a multiple regression model for feedforward: 4 hours
Sunday 08-03 Finalized pre-filtering backend + made API calls more reliable 4 hours Processed the results of the multiple regression analysis and added them to the wiki: 3 hours Worked more on node.js, expressJS and the UI: 6 hours

Week 5

Goal: Work on software

Group Mats Erdkamp Sjoerd Leemrijse Daan Versteeg Yvonne Vullers Teun Wittenbols
Monday 09-03 We attended the tutor session
30 minutes
Attended the tutor meeting: 30 minutes Attended the tutor meeting: 30 minutes Attended the tutor meeting: 30 minutes Attended the tutor meeting: 30 minutes
Tuesday 10-03
Wednesday 11-03 Try to specify/quantify "excitement" and search for data on it: 2 hours Elaborated meeting notes: 30 minutes
Thursday 12-03 We had a meeting in which we discussed the feedback from the tutor session, formed a more detailed and specific plan for the project.


1 hour

Attended the group meeting: 1 hour Attended the group meeting: 1 hour Attended the group meeting: 1 hour Attended the group meeting: 1 hour
Friday 13-03 Ideated extra backend implementations: 1 hour Creating a graphical system overview: 2 hours Worked on a more general grouping of the different genres and worked on the visualization of a part of the back end 1 hour
Saturday 14-03 Describing the system overview on the Wiki: 2 hours Started working on interview with the Effenaar: 1 hour Worked on getting to know Bootstrap JS for creating the UI: 2 hours
Sunday 15-03 Worked on a QET matching algorithm: 2.5 hours Worked on learning parts that are useful for creating the UI & a little bit on the UI itself: 5 hours

Week 6

Goal: Finish software , do testing

Group Mats Erdkamp Sjoerd Leemrijse Daan Versteeg Yvonne Vullers Teun Wittenbols
Monday 16-03 We attended the tutor session
30 minutes
Attended the tutor meeting: 30 minutes Attended the tutor meeting: 30 minutes Attended the tutor meeting: 30 minutes Attended the tutor meeting: 30 minutes Attended the tutor meeting: 30 minutes
Tuesday 17-03 Worked further on QET track ordering: 2 hours
Looked into Java MATLAB connection: 1 hour
Worked on UI 2 hours
Wednesday 18-03 Looked into Webflow. 2 hours Worked out interview with the Effenaar: 2 hours
Thursday 19-03 Worked on an interface for the QET, now works with .txt files: 2 hours
Learned gitHub: 1 hour
Worked on UI 5 hours
Friday 20-03 We had a meeting in which we discussed the feedback from the tutor session, and worked on setting up GitHub.


1.5 hours

Attended group meeting 1.5 hours Attended the group meeting: 1.5 hours Attended the group meeting: 1.5 hours, Looked at/trying to understand Mats's improvements on UI 30 minutes Attended the group meeting: 1.5 hours
Saturday 21-03 Improved frontend code, took a Vue,js class 5 hours
Sunday 22-03 Searched for frontend CSS design & Improved code 4 hours Added new inputs and a value display to the UI 2 hours Worked on the user interface using the code Yvonne made. I changed the HTML slightly and added CSS in Adobe Dreamweaver. 3 hours

Week 7

Goal: Finish up the last bits of the software

Group Mats Erdkamp Sjoerd Leemrijse Daan Versteeg Yvonne Vullers Teun Wittenbols
Monday 23-03 We attended the tutor session
30 minutes
Attended the tutor meeting: 30 minutes Attended the tutor meeting: 30 minutes Attended the tutor meeting: 30 minutes Attended the tutor meeting: 30 minutes Attended the tutor meeting: 30 minutes
Tuesday 24-03 Backend development + CSS slider development 7 hours Did research on MATLAB Compiler for Java application: 3 hours
Wednesday 25-03 Learned CSS + started integration of backend 6 hours
Thursday 26-03 We had a meeting in which we discussed the feedback from the tutor session.


1 hour

Attended the group meeting: 1 hour
Updated the API reqiest code: 3 hours
Attended the group meeting: 1 hour
Tried to transform MATLAB functions to Java: 3 hours
Attended the group meeting: 1 hour
Rearranging the wiki and improving the display of code on the wiki: 45 minutes
Attended the group meeting: 1 hour Attended the group meeting: 1 hour
Friday 27-03 Worked on a GUI for QET matching: 2 hours Scanning through the wiki on unsubstantiated choices and other nitpicking: 2 hours Worked on the UI 6 hours
Saturday 28-03 Worked on GUI for QET matching: 3 hours Made mockups of the lay-out of the final site and got feedback from users 2.5 hours
Sunday 29-03 Reported my progression on the wiki and editing existing pages: 2 hours Scanning through the wiki on unsubstantiated choices and other nitpicking: 1.5 hour
Starting on validation of user needs: 1.5 hour
Worked on the UI 5 hours

Week 8

Goal: Finish wiki, presentation

Group Mats Erdkamp Sjoerd Leemrijse Daan Versteeg Yvonne Vullers Teun Wittenbols
Monday 30-03 We attended the tutor session and had a skype meeting after that ourselves
30 minutes + 1 hour
Attended the tutor meeting: 1.5 hours Attended the tutor meeting: 1.5 hours Attended the tutor meeting: 1.5 hours Attended the tutor meeting: 1.5 hours Attended the tutor meeting, slightly adjusted mockups and analyzed my own results from the user test. 2.5 hours
Tuesday 31-03 Worked on the Wiki page: 1.5 hours Worked on restructuring the wiki 2 hours Updated the SotA and user interface reorganized the structure of the wiki 3 hours Worked on the new user interface of the website using CSS 3 hours
Wednesday 01-04 Spent time on CSS 2 hours Working on the presentation and wiki: 2 hours Read other wikis to find out what could still be added to our wiki. Executed user-tests 1 hour Worked on the user interface of the website using CSS 1.5 hours
Thursday 02-04 Had an online group meeting: 1.5 hours Attended meeting: 1.5 hours, worked on presentation: 2 hours Attended the tutor meeting: 1.5 hours Attended the group meeting: 1.5 hours
Friday 03-04 Worked on the presentation: 1 hour, had a meeting: 1 hour Worked on the Introduction and more on the structure of the page 1 hour
Saturday 04-04 Spent time on code optimization: 8 hours Worked on the presentation: 30 minutes Worked on the Validation of the user needs 2 hours
Sunday 05-04 Kept working on the code: 6 hours Worked on the Validation of the user needs 4 hours Worked on the User Interface of the website. 4 hours

Week 9

Goal: Finish wiki, site and last things

Group Mats Erdkamp Sjoerd Leemrijse Daan Versteeg Yvonne Vullers Teun Wittenbols
Monday 06-04 Finished the code and the CSS-layout 8 hours Worked on the presentation: 2 hours Worked on the Validation of the user needs: 2 hours

Worked on the Future Works: 30 minutes

Finished Introduction and user test 1 2 hours Finished the UI of the website. Added a part on the user interface in the wiki and did a spell check of the whole wiki. Wrote part of the conclusion and discussion 7 hours + 1 hour + 1