Continued expansion

Updated more methods, currently mostly just a framework of ideas. Will need to actually code it all together.