cleaned out branch
snarf from poole..