Added mock shiz and split up work