Added goji, bit of cleanup, added services endpoint