In process of building, lots of commented out test code in here