Working version 1, cleaned up trash