kind of fixed a bug. think this prototype is done for now