I decided to work on this as well, since it has mostly been there without doing anything. Mostly working now! :D