Finished initial hack