Some more module stuff, cool builds are incoming :P