Almost Done

Needs comments