cleaning up, working on making it more 'node like'