Almost got everything working

Should keep up version control from now on