restructure restructure =)
fix these stubs a bit

they're still stubs though
add thingy for testing thingy!