Almost finished

Just a couple of things left