Final stuff

Still not 100% Perfect but alrighty!