Remove extract sourcing
Move code around
Fix bug asking to press enter on start