Expanded on notes and added more future features