Added various methods to try and speep things up.
Forgot this as part of the last commit
Merge branch 'master' of github.com:radiantbluetechnologies/omar