Still hacky, but with steps planned out