Partial Finish

Finished what is needed, have not bug tested