Ugly blob commit - finishing assignment