Got things working on a base version