Polish
Further functionality
Initial push
Refine