See your accountant.
Its hard enough to work out everything when intentions don't change. When they do, its messy. I've had to go through a few discussions with the tax office myself with some clients when they get audited on these issues and even they have problems with it.
