Made some more progress
Basic functionality working