Completed app for the most part

next will fix bugs, errors, make tweaks