moved files around
mostly functional now
added comment