Fixed more of the formatting mess and added the two methods to be implemented