Continue work on basic functionality