I finally got off my ass and finished this