Feature/system revamp

Just added a few things...