Trying and failing with merge junk
Moved back working methods