Undid most of last 2 commits - will be fixed by bitmap at a later date.