this branch is overrides on my (unpublished cuz im lazy) fork

if you want my fork (it may not work as-is, due to broken dependencies/source), let me know and I'll upload my latest changes somewhere.

Author: Efreak