Schwaggot

@aouinizied Sorry, completely forgot about this, just updated the branch to include recent changes.

@aouinizied If there is anything from my side still to be done, just let me know.