Restructure and make real, add test, dangblastit, etc.