Major update, still working on the home