Comitting some code that actually works although is just bare functionality at this time