Second Commit

More structure