Finishing the basic prototype