Major updates. Admin isn't complete, but everything works as far as it goes