Initial Commit with bugs