added boundaries, which are acting unreliably
got boundaries working