Proof of concept, added addition functionality