Have made a ton of changes since last commit, oh well