Well this is still mostly place holders but it's a start

-changed some things around