ahhh working! now time for cleanup & styling