Initial Commit containing majority of changes