Battery life

This patch will complete #11, however the model now needs major simplification, it is getting very messy and convoluted