More work

Next to come is the options screen and being able to change settings.