Beginning work on core functionality