Major update, final changes, moving stuff around