cleaned up
working on additional parsing methods