WIP, many things done for beta