remove old manual_input, begin merging parser w/ main body