First commit
made simpler