A lot of changes because I haven't committed in forever