starting to look better, still have to fix many of the things I broke but the structure is there at least :)