All core functionality working

All of the core functionality should now be working.