project2

pretty much done, output can still be improved