Issue #3 - Very crud implementation, surely needs improvement.