1.4 working I think
minor file reshuffling