last commit before massive overhaul