Cleaned up preparing to actually do this