finished up all major features- ready for beta\!