New project

Made some changes, consolidated, and got rid of superfluous code