Finished input parsing
Added test cases, fixed cell spacing