got things compiling but some weird bugs persist
dropped class files