App Final Version Commit

-Most enhancements are in working condition. Some minor bugs.