updated to make some todo things neater