Development Branch

Moving the work that's still under development to the develop branch.

Signed-off-by: Seth Battis <SethBattis@stmarksschool.org>