some intial work
intermediate commit, just for savety