Big update. Fresh start, haven't pushed in a while