updates...

a lot more to be updated here, but this is just basic functionality