Tightly couple more things (FOR NOW) to get  working