adding properties kind of works

it feels dirty though, might either keep working on it, clean it up or
scrap it.