Inital Commit of basic functionality