Initial Commit, basic functions working