Started redoing the whole code base, better structure stuffage