Almost Done

Everything is good to go except Groups functionality and design polish.