Sorted the estimates although a more complex estimation service could be implemented, this will certainly be accurate enough for now.
Merge branch 'refs/heads/develop_steve' into dev