Should be sprint worthy now.

Cleaned up interface, etc.