Updated all methods to be feature complete