Adding some definitive design!