WIP but close...

Will finish this over Christmas break.