First Commit
More design