This code is really hacky still