messing around
conflicts resolved
added venue/category methods
resolved conflict