Comitting this so I can continue on it at home