Updated everything

Gave functions and have most things in place