Finished up the Majority of changes, have yet to test this (cause my
eclipse is being "janky") but I will test (if it allows me to do so
without updating the 'gen' package)