Fixed the big red flag. Fully unimplemented the broken modularity
system.