Work on better API def and stubbing subject functions