First list of changes - many bugs to solve still