porting over old codebase into something presentable!