Moved to a Move base approach (haha) for a better/simpler API