still working on stuff

trying to keep code clean and include all elements to project