Nearly Finished

Needs Final Print and testing