Beginning cleanup process
Parsing updates
Rework finish, added function returning values