Finishing up the basic system