got a running version with hacks, need code and layout cleanup