created one parsing function... pretty sketchy
cleaned up parse with where
split functions between files
initial commit on daniel's comp
conflict merge