meh
merge issues
restructuring a litte