Converted to using build-in lists, added start of implementation