moving stuff to static
commiting back