made more generic
made more generic
made more generic
organised better
getting there
organized more
made cleaner
todo stuff