Probably last commit before code freeze -mimee
final changes from hackathon