Reworked all old files, now works with new monkey

:)