Initial Commit with semi-full functionality