New - hopefully more logic - file architecture