Almost done moving stuff, still does not compile