oojsified more, still needs to be mvcfied, everything working