Little update, comitting to show the current state so that others can do some doxing too