Initial commit of total revamp.

Am i doin this rite????!

Bliergh.