inital commit and already working :)