Most of it's finished

Still need to work on scoring and a few other things