Initial Commit

Alpha from milestone 6