Working on new things & more code clean up