Updated again.
Another update. Keep names in one word so I can push them nicely. ;_;