Got the basic version working