Working on making the system self sufficient