Removed useless code
Updated support library
RRRREFACTOR. Things are broken, hang on tight