Functionaly finished except email

Functionality for the most part is finsihed except the email