Second iteration of proof of concept code