Added proof of concept factory