Merge of homework and work @TCD