Moves over proof of concept code