mapped out a few more methods and classes