Basic functionality working--cleanup now