Rewrote a lot of code and passed basic object fetching