Hopefully the final commit >.<

Done for now :D