some todo's - quit overthinking this