My first commit having almost everything done