Final changes

Finalized, functional app