TODO: added some todo notes so I can pick right back up